Add support for ARM Cortex-A35 processor
authorSandrine Bailleux <[email protected]>
Thu, 7 Jan 2016 16:52:49 +0000 (16:52 +0000)
committerSandrine Bailleux <[email protected]>
Tue, 12 Jan 2016 09:25:12 +0000 (09:25 +0000)
This patch adds support for ARM Cortex-A35 processor in the CPU
specific framework, as described in the Cortex-A35 TRM (r0p0).

Change-Id: Ief930a0bdf6cd82f6cb1c3b106f591a71c883464

include/lib/cpus/aarch64/cortex_a35.h [new file with mode: 0644]
lib/cpus/aarch64/cortex_a35.S [new file with mode: 0644]
plat/arm/board/fvp/platform.mk

diff --git a/include/lib/cpus/aarch64/cortex_a35.h b/include/lib/cpus/aarch64/cortex_a35.h
new file mode 100644 (file)
index 0000000..4288b9f
--- /dev/null
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2016, ARM Limited and Contributors. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * Neither the name of ARM nor the names of its contributors may be used
+ * to endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __CORTEX_A35_H__
+#define __CORTEX_A35_H__
+
+/* Cortex-A35 Main ID register for revision 0 */
+#define CORTEX_A35_MIDR                                0x410FD040
+
+/*******************************************************************************
+ * CPU Extended Control register specific definitions.
+ * CPUECTLR_EL1 is an implementation-specific register.
+ ******************************************************************************/
+#define CORTEX_A35_CPUECTLR_EL1                        S3_1_C15_C2_1
+#define CORTEX_A35_CPUECTLR_SMPEN_BIT          (1 << 6)
+
+#endif /* __CORTEX_A35_H__ */
diff --git a/lib/cpus/aarch64/cortex_a35.S b/lib/cpus/aarch64/cortex_a35.S
new file mode 100644 (file)
index 0000000..6a447c0
--- /dev/null
@@ -0,0 +1,164 @@
+/*
+ * Copyright (c) 2016, ARM Limited and Contributors. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * Neither the name of ARM nor the names of its contributors may be used
+ * to endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <arch.h>
+#include <asm_macros.S>
+#include <bl_common.h>
+#include <cortex_a35.h>
+#include <cpu_macros.S>
+#include <plat_macros.S>
+
+       /* ---------------------------------------------
+        * Disable L1 data cache and unified L2 cache
+        * ---------------------------------------------
+        */
+func cortex_a35_disable_dcache
+       mrs     x1, sctlr_el3
+       bic     x1, x1, #SCTLR_C_BIT
+       msr     sctlr_el3, x1
+       isb
+       ret
+endfunc cortex_a35_disable_dcache
+
+       /* ---------------------------------------------
+        * Disable intra-cluster coherency
+        * ---------------------------------------------
+        */
+func cortex_a35_disable_smp
+       mrs     x0, CORTEX_A35_CPUECTLR_EL1
+       bic     x0, x0, #CORTEX_A35_CPUECTLR_SMPEN_BIT
+       msr     CORTEX_A35_CPUECTLR_EL1, x0
+       isb
+       dsb     sy
+       ret
+endfunc cortex_a35_disable_smp
+
+       /* -------------------------------------------------
+        * The CPU Ops reset function for Cortex-A35.
+        * Clobbers: x0
+        * -------------------------------------------------
+        */
+func cortex_a35_reset_func
+       /* ---------------------------------------------
+        * As a bare minimum enable the SMP bit if it is
+        * not already set.
+        * ---------------------------------------------
+        */
+       mrs     x0, CORTEX_A35_CPUECTLR_EL1
+       tst     x0, #CORTEX_A35_CPUECTLR_SMPEN_BIT
+       b.ne    skip_smp_setup
+       orr     x0, x0, #CORTEX_A35_CPUECTLR_SMPEN_BIT
+       msr     CORTEX_A35_CPUECTLR_EL1, x0
+skip_smp_setup:
+       isb
+       ret
+endfunc cortex_a35_reset_func
+
+func cortex_a35_core_pwr_dwn
+       mov     x18, x30
+
+       /* ---------------------------------------------
+        * Turn off caches.
+        * ---------------------------------------------
+        */
+       bl      cortex_a35_disable_dcache
+
+       /* ---------------------------------------------
+        * Flush L1 caches.
+        * ---------------------------------------------
+        */
+       mov     x0, #DCCISW
+       bl      dcsw_op_level1
+
+       /* ---------------------------------------------
+        * Come out of intra cluster coherency
+        * ---------------------------------------------
+        */
+       mov     x30, x18
+       b       cortex_a35_disable_smp
+endfunc cortex_a35_core_pwr_dwn
+
+func cortex_a35_cluster_pwr_dwn
+       mov     x18, x30
+
+       /* ---------------------------------------------
+        * Turn off caches.
+        * ---------------------------------------------
+        */
+       bl      cortex_a35_disable_dcache
+
+       /* ---------------------------------------------
+        * Flush L1 caches.
+        * ---------------------------------------------
+        */
+       mov     x0, #DCCISW
+       bl      dcsw_op_level1
+
+       /* ---------------------------------------------
+        * Disable the optional ACP.
+        * ---------------------------------------------
+        */
+       bl      plat_disable_acp
+
+       /* ---------------------------------------------
+        * Flush L2 caches.
+        * ---------------------------------------------
+        */
+       mov     x0, #DCCISW
+       bl      dcsw_op_level2
+
+       /* ---------------------------------------------
+        * Come out of intra cluster coherency
+        * ---------------------------------------------
+        */
+       mov     x30, x18
+       b       cortex_a35_disable_smp
+endfunc cortex_a35_cluster_pwr_dwn
+
+       /* ---------------------------------------------
+        * This function provides cortex_a35 specific
+        * register information for crash reporting.
+        * It needs to return with x6 pointing to
+        * a list of register names in ascii and
+        * x8 - x15 having values of registers to be
+        * reported.
+        * ---------------------------------------------
+        */
+.section .rodata.cortex_a35_regs, "aS"
+cortex_a35_regs:  /* The ascii list of register names to be reported */
+       .asciz  "cpuectlr_el1", ""
+
+func cortex_a35_cpu_reg_dump
+       adr     x6, cortex_a35_regs
+       mrs     x8, CORTEX_A35_CPUECTLR_EL1
+       ret
+endfunc cortex_a35_cpu_reg_dump
+
+declare_cpu_ops cortex_a35, CORTEX_A35_MIDR
index cb5f5d7ed34d16b26de18b099e1e1a747361d05f..22df6d7e71c4096537f0cc17e8d15c0e52067d66 100644 (file)
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013-2015, ARM Limited and Contributors. All rights reserved.
+# Copyright (c) 2013-2016, ARM Limited and Contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -64,6 +64,7 @@ PLAT_BL_COMMON_SOURCES        :=      plat/arm/board/fvp/aarch64/fvp_common.c
 
 BL1_SOURCES            +=      drivers/io/io_semihosting.c                     \
                                lib/cpus/aarch64/aem_generic.S                  \
+                               lib/cpus/aarch64/cortex_a35.S                   \
                                lib/cpus/aarch64/cortex_a53.S                   \
                                lib/cpus/aarch64/cortex_a57.S                   \
                                lib/semihosting/semihosting.c                   \
@@ -87,6 +88,7 @@ BL2U_SOURCES          +=      plat/arm/board/fvp/fvp_bl2u_setup.c             \
                                plat/arm/board/fvp/fvp_security.c
 
 BL31_SOURCES           +=      lib/cpus/aarch64/aem_generic.S                  \
+                               lib/cpus/aarch64/cortex_a35.S                   \
                                lib/cpus/aarch64/cortex_a53.S                   \
                                lib/cpus/aarch64/cortex_a57.S                   \
                                plat/arm/board/fvp/fvp_bl31_setup.c             \